Spironolactone or hydrochlorothiazide